Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

67 add control strategy recommendations #88

Merged
merged 205 commits into from
Apr 15, 2024
Merged

67 add control strategy recommendations #88

merged 205 commits into from
Apr 15, 2024

Conversation

panositi
Copy link
Contributor

Recommendations implementation is not fully complete. Attack path calculations is done, including logical expressions. The remaining part is to explore the CSG tree and apply CS changes.

@panositi panositi linked an issue Oct 18, 2023 that may be closed by this pull request
Add control strategy recommendations API #67
Closed
@ghost
Copy link

ghost commented Jan 9, 2024 •
edited by ghost
Loading

👇 Click on the image for a new way to code review

Review these changes using an interactive CodeSee Map

Legend

CodeSee Map legend

kenmeacham and others added 10 commits January 10, 2024 17:22
@kenmeacham
#67: Set cache mode to true for querierDB in calculateRecommendations…
cec44d7 
…. Also improve resilience to null data values in various places.
@panositi
#67 block comments update controlSets map
64ec0b2
@kenmeacham
#67: Validation and risk calc not required in testRecommendations, so…
292ece7 
… commented out (probably could be removed completely)
@panositi
Merge branch '67-add-control-strategy-recommendations' of github.com:…
75db2c7 
…Spyderisk/system-modeller into 67-add-control-strategy-recommendations
@kenmeacham
#67: Add test domain/system models for recommendations
a7f0e89
@kenmeacham
#67: Create basic unit test for /recommendations endpoint
961b9e2
@panositi
#67 update datasets after risk calculation
3f20606
@panositi
Merge branch '67-add-control-strategy-recommendations' of github.com:…
99d1d95 
…Spyderisk/system-modeller into 67-add-control-strategy-recommendations
@panositi
67 refactor methods
ddffde6
@panositi
#67 remove allPaths param from recommendations method
0441335
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
3.7% Duplication on New Code (required ≤ 3%)
B Reliability Rating on New Code (required ≥ A)
B Security Rating on New Code (required ≥ A)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

kenmeacham and others added 23 commits March 13, 2024 10:33
@kenmeacham
Merge branch '67-add-control-strategy-recommendations' into 145-recom…
ea7a807 
…mendation-task-cancelling
@kenmeacham
#145: Fix endpoint for cancel recommendations and made it POST
e571f6a
@kenmeacham
#145: Comment out code that prevents final result being downloaded af…
6018d19 
…ter abort. TODO: check and delete if possible
@kenmeacham
#145: Add jobId to abortRecommendations
7d3cac2
@kenmeacham
#145: Update progress to "Cancelling" when /cancel is called
5e73b94
@kenmeacham
#145: Call pollRecommendationsProgress immediately after abort, to ge…
6e91a90 
…t updated progress
@panositi
#145 fixing interrupted exceptions
2171ffd
@panositi
#145 fix merge
23cfdce
@kenmeacham
#145: Fix bug in checkRecJobStatus that was setting status to ABORTED
4353bfe
@kenmeacham
#145: Remove cancelTask, which was unused
5fb8abd
@kenmeacham
#145: Remove redundant calculateRecommendationsBlocking method and as…
127ce59 
…sociated unit test. Recommendations are only used as an async job
@kenmeacham
#145: Fix async recommendations test. Should use POST for /cancel and…
b4a20a1 
… check for "FINISHED" status, otherwise test may never complete
@panositi
#145 refactor job state and status
325717c
@panositi
#145 change RecommendationJobDTO to return state and message
93b32ce
@panositi
#145 fix previously merged issues for ModelController
ad543de
@panositi
#145 allow recommendaitons algorithm to run also without jobId
a7d51e4
@kenmeacham
#145: Set systemmodeller logging level to debug
3a3762f
@kenmeacham
#145: Add extra text "Esc to cancel" during recommendations
d9c8e79
@kenmeacham
#145: Set recommendations.timeout.secs=900 (15 mins) in application.p…
fbd5648 
…roperties
@kenmeacham
#145: Implement recommendations timeout
08cdcb0
@kenmeacham
Merge pull request #155 from Spyderisk/145-recomm-timeout
9e28779 
Merge recommendations timeout branch into main 145 branch
@kenmeacham
Merge pull request #146 from Spyderisk/145-recommendation-task-cancel…
87b5d8b 
…ling

145 recommendation task cancelling
@kenmeacham
#67: Fix bug in applyCSGs; compareTo should not check specific value
67349bf
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
B Reliability Rating on New Code (required ≥ A)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

kenmeacham
kenmeacham approved these changes Apr 15, 2024
View reviewed changes
Copy link
Contributor

@kenmeacham kenmeacham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After discussion we have agreed that this code is good enough to merge into dev

@kenmeacham kenmeacham merged commit 98bbb27 into dev Apr 15, 2024
2 of 3 checks passed
@kenmeacham kenmeacham deleted the 67-add-control-strategy-recommendations branch April 15, 2024 16:52
@kenmeacham kenmeacham added this to the Release version 3.5.0 milestone Apr 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@scp93ch scp93ch scp93ch left review comments

@kenmeacham kenmeacham kenmeacham approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Release version 3.5.0
Development

Successfully merging this pull request may close these issues.

Add control strategy recommendations API
4 participants
@panositi @kenmeacham @scp93ch @mike1813